rebase - attempt 2