redoing buruno's modifications. He's learning git :-)