Updated as suggested