Updated according to your suggestions. Ready to pull.