trying to fix dem shitz