Add @dnene's changes