Second branch commit 1
Fixed conflicts after pull
Final fix for second branch
Fixed some conflicts