Vlad's changes