add better stuff that works