First attempt to integrate teacher code