Added logic from pablo, awesome pairing!! v1 done!