minor changes and function name changes