Did some changes to IO