JG: undoing mistakes!