merged with master updates