improved capture logic