Updated after Friday testing.
More updates!