Testing and debugging
Made small changes on Server