Incorperate Dima's feedback