Probably better off doing this for all functions