a lot of fix