this would be a much more involved change, so i changed it to match the first suggestion for now