Little modif on this class