Visibility changes & removed debug messages