Another re-factor update