Fix for update in backbone
Fix for update in backbone
Got rid of work directory
Fixed conflict--moved comment to top of function