more stuff that probably(?) works