* Improve pic sync