Updated for comments made