Added code to skip unecessary steps