Even more hacky