Finished the IfElse Problem