added tranform and json bolts
fixed conflicts