synced with hermes
added missing files (temporarily)