Minor update

Merged my code with Steven's