Improvment on new features