Final changes from client