Removed Extra If Check