Update physics computation tasks
Resolved merge conflicts