changing for new layout