Merge with some of codys healing code