Updated index based on bitstarter framework