add option to skip unless scaffold mode set to true