Definitions refined.