Updated based on PR#1 feedback