improved ux :v: