pushing for merge with jQuery code from Matt