much better integration