code changes from pairing session 12/23/2013