Is there a better way @aleezabenshalom ?