Made changes to address maline issue #10