Updated for proper coverage