Updates to improve culling