Improved delayed model and @todo's for Franz.