Jamie and Adrians merge of code