changed to extend BaseActivity instead of Activity