Updated application to work with version 2.1