after thinking about things a lot, some changes