Updated helper to not piggyback off of original.