Added guard expressions