Updates to Front and Back End