Made a few changes with some definitions.