performed a ton of normalization and renamed for disambiguity between v3 and v4, not super happy with it though