Removed evaluations. Moved fields partials. related to #3