Rewrote mode and feedback sections