tidying up, now under 7k!