Made changes based on Raine's suggestions