Updated to match other media