Just redid some of the first functions for fun :)