some checks added