next iteration of fixes