updated for schema change
some comments, new target