Now no longer needed (comment 2 lines up can be changed too)