options added and spec cleaned