Fixed memory issue; changed default database