Added the changes Rick and Fede suggested to the conc.