attempt 1 at fixes