finished fixing Martin's comments