wrap,tray,notJoy
Almost fixed object reference.
merged Annania, Jose, Lesslie changes 5/9/14