fix bugs and new image
with pbx
fixed conflicts