fixed Erik's comments