More guard and adding Unicorn