Added more control