Updated according bitstarter design