jacket-16
Added conditionals