Make it work (a little better)