Changes made - back-end/front-end