More updates based on Christer's inputs