Added more to this.

Extra if statements added.