Updated to pull data from customData