Merged with Ron's changes (for real this time)