finish revising pairing with Support