added guard support
added guard support
Created guard and fixed a lot of specs