Reordered methods, fixed add students bug