More supply stuff- removed most of old stuff