Upgrade to neo 2.0