adaptations to allow for editing