Started to add better block visible check