Improved Hero controls