final merging of dylan and claytons stuff