added to_i to places it needed to be