a few changes needed for my own purposes