Updated Application Code