Much better integration