adding small changes to make geniact work better.