Synced up the base class