code duplicacy  removed