merged in arch changes