Updated from PM review