We need a better way.

Updated.