cleaned up everything
Merged with old faithful