changes as suggested by samir