Added more control functions