more follow-ups, rather functional by now