changed to spring and guard
fixed conflicts from merge