I didn't like the order of operations
Merge pull request #2 from qiuey00/jeff/some_p6_changes

I didn't like the order of operations