Improve not just for students section