changed jumpy
fixed conflicts
update 8/13