Refined Implementation