ok fianl edit oops