Update for sys06 and archi06