Added new features, changed variable names.