-Some small checks added