Yes, will make the necessary changes.
Should have seen you comment, before commiting similar changes in other functions.
Need to thoroughly look at the notification system.