Minor update to be able to use