Changes from Jigll applied.