Important: function comp changed