hopefully fixed it part2