Final changes +new assm files