Added guard and base