1part2 and 5part3 tweaked