Merging with Ricky's changes.