edits with additional info from frank in workshop