Update Youri & Paktwis

Combined by Jens mainly added structure