Same 2 issues with this block.  Wrap and use callback.