fixed overload issues, cft collapse still broken