further changes - samir