Adds Chris changes fixes #55