Eugene's changes