Commit with updates after some testing with server.