changed the variable names and moved the constants to conf.v