Implemented Alan's Suggestions