fixing duplicate functionality.