Updated module with patch for multiple viewers