[arch-dev-public] adopted more stuff

Back to the list