Merging klahiri changes Plan, Previous Work