patched if statement, no longer needed
further note changes