additional changes from master