commented out some things to allow compilation of commit