Updated as per feedback