added new definitons and changed variable names