added youssef's db changes