Moved visibility to here