have work around for pairing problem. need to propagate changes through rest of code