Changes for TI course. Removed steps.. rollback!