fixes1 finished