more changes
get ready to shard