last changes on modals branch