B) above would be the less-hacky way to go, if you have time