merge progideon stuff from tom