change order of persisting requests and responses. Made wrong for NR