Major update for 1st Revenue Firebase app