Improve unicorn