Add Torbjørn suggestions