Added more control structure