ESS-588 added modal controller