Updated for android studio