Added more fields and improved beep