update due to comments