Renmaed 2 funtions that weren't in the current coding style