refactoring
Testining on localhost server
Limited digging