Some checks added