removed antiquated code, added whistle.js