Split up from part 3 (Note i needed to add now a lot more skips, due to no fixes in the prepare script)