Port 1.7 part 2