pushing code back up to 2000 vars as this doesn't seem to affect issue #137 after all