Fixed coordinate class, changed Integer to Int