updated to match new struct parsing