removed @staticmethod's that cause errors