[IMP] improve visibility changes as per task specification