Moved from Integer to int + small corrections