Still fixing the intensive missing problem, should be fixed!