model added and warnings removed