Added names to all functions #13