Updated Server, added indicator