modified for comments--issues remain