Made Changes in order retain the original code.(which was changed for testing).