Adding last changes (Jonas & me)