Make visibillity better