Added basic controls