New ess friendly edits