copied eee from dev to master