Completed suggested changes