Changes to base activity