updates to work with EE 2.9