Add stuff back to prepare for rebase