Updated ready for merging of other components