Merged and used ternary operator bc Matt should use them too.