Jay's changes to all da files