post-rebase identifier fix
refactor in progress