updated to fit standard (i.e., attributes with _)