merging for Joseph to pull down