fixs and changes
more code
fix conflict