latest changes from srinath mac