Adding more control