Changed as suggested