recoded and issue resolving , in progress