Another function cleaned and added