Modified function names to simply code