Removed pairing code for now
Fixed mac address code