changes from pull req 1