OK, this looks much saner