Prepare for x6 (made before update and unfinished)