Update files according to @jstupak request.