Small changes.
Binded to visibility API.