Sanity checks added