more changes to fit satrapy struct