Fixed all of the things with Johnny