Merge Farz's changes which for some reason he never committed