Controller structure has been redesigned