simplify based on edgar's feedback