Changed CPP yield to apply on link weights

Started import into main model