See Updates/Additions in Post #1