added source file; renamed variables