Rebasing with working app