Revert build ; add --expert