Updated for comments