Move towards sparse-cat branch