prepared for conditions
cleaned up definitions