completed as per new layout