Manually implemented suggested changes