Modifying a few more things