Merge initial code from byteGator sharing