changed editing conditionals