and adjust for our use case again