watermark management
debugged submission