Upgrade undercover to 6.0