Did some editing. Merge pls