Added notifications. Fixed order making handlers.