some stuff addded