update to handle comments