Changed Unicorn setup