Added more to ito calc stuff