[IMP] Improve visibility changes as specified in task