Class Update: Added Comments