just bringing it all into line