Guard logic changes