Updated to api 1.1