Final Added Ternary Operation and works perfectly. Much easier.