update for new layout method