fixing stuff part 1