UI and 2.2 API update