more sanity checks added