#320 Starmachine Edits