Final Changes and Server Side code