Merge of Sean/Hugh and nick