move these under all the checks