Commited Changes
updates to base class