refresh
first merge
added back firebase