Implement proposed changes