Reverting katie's stuff and adding mine