minor clean up from ID02 with adaptations...