re-added Emre's recent edits after accidentally deleting them