Some modifications
rm