Improve student logic