Changed I type back to int
Merged with Chris' changes, bus I now int again