Final Changes

fixed