fixed part1 so it works 100%