still not convinced we couldn't subclass instead of modify this class...