Fixes problem #3 - working but is limited to 10k