merging back from eneko