Further checks added