Added to Master Branch -2nd line (fix for DataBase)
MASTER BRANCH - 3rd line (Performance fix)