Better hiding logic