Merge pine and dye's visibility fix