Annotated some areas needing to be changed.