Fixed Yazdaan's stupid mistakes