converting to new layout