Emas changes

fixes #1