Merge with Simo's code.