Changes after guard and spork