TODO note to add try catch