(this is emily btw) took out some ugly lines