Changed from Float and Integer to int and float