Updates
Current changes.
Made fix changes.