sync with jspears/mers