Synced all changes + G3 almost done