updates to system and classes