flagrate.Modal: improved