fixed if statements. Alpha ready