Issue 537 - Consider changes made for marking first few downloads