conditionals added