implemented Winston's suggestions