adapt for new layout