Adding emerald support
--amend