Removed Williams changes (for testing)