final(?) changes. should work now