Final Changes from Client