preliminary edits
works with current data