Updated with teacher table populated