Changed validate calls to guards