Revert "Revert "Added handling for new multiplier system""

This reverts commit 5e6ad570e0bf5926ad6a3769322dc5d67ab011a7.