Added Bungu's changes