Changed to new code conventions.(lowercase functions)