merge vitvad's request