remi's changes.

this version compiles.