More updates
Merged changes from Sebastian