elihwyma Update Implementation to new spec