Updated with fresh production dump