updated to work with latest android studio