Added If, couple fixes