isset checks added