Steve & Rick' suggestions addressed