Making some tweaks to Beep...