update to better integration