fixed/simplified