Merging easility with deanhiller

Merging easility with deanhiller