UPDATES TO BOTH FRONT END AND BACKEND