i think i added none statements