dataBase - shir's changes inside
stav: Fix the errors