That does seem like a better approach. So, the only part that would be synchronized in the runnable would be what are currently lines #284 through #285?