small adaptations, not fully error less