This should make it better and work and make aran happy. Probably.