edited to remove the unnecessary `|| null`