redesign of something I did a day ago- (i'm lazy)