make changes suggested by matiu