More updates
Merged updated from Sebastian