Changed Location and added SQLite