Touch ups
Fixed conflicts
Rollback of tri's change