Adding guard and spec