Changed to use addBitless handler