new init of my project
made other changes
fix 1
fix 2
fix 3
hot 1
hot 2
mater add 2
fix4 and fix5
merged