Updated to support tuple 2s