Improve server; add notifies