conditionals added to scripts