Modifying some stuff around