Water mark and bug fixing.