lots of fix