Major Changes in front-end + back-end