Merge Ron's changes