added edits that were removed from 1.0.21