Clien-Server interation achieved over CORS
Merge confict fix