Adding more intuitive controls