Add modified files from Friday for testing tweaks