adding server changes and tab indentation