modified stuff for submission