Modifications from Friday testing