Refactor add new force calc 2 [work]