minor design adaptations