more updates after feedback