Updated as per design