Added some functionality, condensed conditionals
Added some functionality, condensed conditionals