more integration plus some visual updates