updated and fixe