* Added pairing classes
 * Added more listening