Rebase
Rebase
No need to remove listener
Rebase, testing errors patch
Switch to auto array
Kill some blank lines