Adding in initial checking