Temp commit still has issues