Update files from Lucas #1