Attempts at getting a smooth upgrade for unicorn
rev'ed version