last changes to wait feedback