Need to increment before
Cleanup, comments