Added Conditions and Loops