fixing duplicate logic ...