Sync with v1.6 bullets