Neha | Fixing build, adding duplicate code back