Complete

Finished making changes