updating with feedback from Andre