Updated for bitstarter