Swap to new boilerplate code