[ update ] latest progress, still issues