edited classes so they use our log methods