Updated the full paper