commit of all code bar alex's