New version after work from the Arch panel