looks like repaired
merging with good version