Make it better
thx to Fred