Change the hiding mechanism away from commenting out