addressed CR feedback