adapted for new format
docs updates