More checks added