Updated for new bugger format and promt method
Cleanup of notificationcall