Boundary checks - in progress