Improvements
Better specs w/ guard