updating Rational and re-organising