samir's changes