Implement the following changes: