Added more checks and sanity for an initial run