made the temp stuff more "portable"