Updated Front and Back End