Adding unicorn and remove thin