add skip this step btw and functions