changed to spring and guard