modif by niirozz