Improved submit script - this is half to test it