#86. duplicate improvements