Cleanup and updated Changes