fixing these maybe 2