changes from third branch