intro edits
done merging