Made changes based on jon's comments.