bugFixed
bugFixed, bug still can't figure out unitest