Updated for final packaging