Improved definitions and methods.