Added Firebase and fixed