moar changes based on real life testing