Updated Labb2 @ logik13