Unicorn - more tweaking