I think we don't need this if/else block now; we just need the first block. Or am i missing something ?