Added possibility for calling seperate steps