Target Calculation Update

fix #686