replaced some stuff with underscore