changes from spiderman3 on Mon Oct  7 13:15:22 EDT 2013