Changes for new Changes asked by Carlos