Added factors calculation