Re-did_changes

@alia-tarek  Please review these amendments to the master