a few changes from silver shadow