some extra things

yes. kill duplication.