Minor changes
Conflicts with origin resolved