Changes made on Arch
Merge changes