updated to latest develop with more changes to EOA