Testing
Merge conflicts fixed
Fixed uninitialized variables