reworkign to have some fallback