porting over to ee-6.2.x