Updated changes to include recent commits.