another change by brian
fixed merge conflict