hack a bit more