Updated for merging