I made this 10x better