Some changes from stiff, oscar and hector