Norma's commit
normas changes