Updated to final version 5 revision D