Vabesh's changes