implemented new merging
merged with more recent assignments..