Final Version after code and partner swap