rebasing issues...