Update watermarking code to allow live watermarking