Implement stop and update for client