Update files from Lucas #2