got rid of some functions