Add checks back in