got rid of some customer functions