hopefully fixed it part1