implemented juans feedback