Merging Kris's commits