Made changes so that it works with version of android being used on the project