this should work now. gotta test