Adding check to initial setting step