add non-firebase version