adjusts to the new integrated interface