Make it a bit nicer, now that it finally works