An edit I'm actually satisfied with