Dario Ruellan update for 12.04