changed my traits listeners to be more efficient