Updates by Pentatoro