Might help if arrays are initialized.
Added a bit of top-level package logic