Use integers (24/39)

Use integers