adaptations to new layout