Completed Merge

Merged corrected code from last commit.