follow-up system

A collection of 3 issues