Merged Gus' Stuff