commit of the newest working code