Adam/flush better rebased