collions working slightly better, still need work