Complicated the code with extra additions with new other feature