More clarification & removing optional part