multiple conditionals

multiple conditionals added more comments