modified validate_state and import. testing merge