Changes for front and back end functionality