Changes to int & line organisation