TODO updated
fixed uninitialized variable