changes suggested by khurrum