This isn't really an improvement but I'm trying a few things out