Finish switch to unicorn