looking at fixes