Some changes to fix thing
Incrementing