Updated with User Class (Kaity 12-3)