modifying some stuff