updated to YC comments