Final changes to a working code.