An atempt to make things better