Removed the whole notification thing cause it's not working...