Finish support for +2