Improved submit