Final changes to ass6