Update

Server is done for 100%, Reader is done for 95%