changes from spiderman3 on Mon Oct  7 13:20:16 EDT 2013