restoring to a working version
removing some fucks -- end of class