Commented stuff, removed extra stuff for working submit