updated based on your feedback