added some junk, functions, etc