add from master improvements