improve based on Irma's comments