updated feature, removed body field from feature
updated feature, removed body field from feature
merge stuff