Replaced all long incrementors with