Added teacher scaffold