Modified to fix Friday testing bugs.
More updates!