Arrows added - some tidying