Adding preliminary reveal/hiding
Fixed conflicts