Even more factorization on user's side