CaveBug Improvement