merging changes, hope this works