improve performences, adds notification system