Changes for bitstarter