Updated ready for merge