Survey mark & User Edit @Adam