used Option to check null instead