built step added, small refactor