Changed Integer > int in lots of places