merging deanhiller with easility

merging deanhiller with easility