issue #25 progress
others by reverting