More updates
Added changes by Sebastian